From 47e75b34a473032ebc6e24ac37fb7dbda34869a8 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 15 Nov 2017 19:47:56 +0100 Subject: [PATCH] selection: Make GtkTargetEntry not allocatable And remove it being registered as a boxed type (lol). --- docs/reference/gtk/gtk4-sections.txt | 4 -- gtk/gtkselection.c | 66 ---------------------------- gtk/gtkselection.h | 11 ----- 3 files changed, 81 deletions(-) diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt index 8350ef34ce..1b4596bcba 100644 --- a/docs/reference/gtk/gtk4-sections.txt +++ b/docs/reference/gtk/gtk4-sections.txt @@ -5213,9 +5213,6 @@ GtkSelectionData GtkTargetEntry GtkTargetList GtkTargetPair -gtk_target_entry_new -gtk_target_entry_copy -gtk_target_entry_free gtk_target_list_new gtk_target_list_ref gtk_target_list_unref @@ -5271,7 +5268,6 @@ GTK_TYPE_TARGET_LIST gtk_selection_data_get_type gtk_target_list_get_type -gtk_target_entry_get_type
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 339eef1f95..9795ecf474 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -3301,68 +3301,6 @@ gtk_selection_data_free (GtkSelectionData *data) g_slice_free (GtkSelectionData, data); } -/** - * gtk_target_entry_new: - * @target: String identifier for target - * @flags: Set of flags, see #GtkTargetFlags - * @info: an ID that will be passed back to the application - * - * Makes a new #GtkTargetEntry. - * - * Returns: a pointer to a new #GtkTargetEntry. - * Free with gtk_target_entry_free() - **/ -GtkTargetEntry * -gtk_target_entry_new (const char *target, - guint flags, - guint info) -{ - GtkTargetEntry entry = { (char *) target, flags, info }; - return gtk_target_entry_copy (&entry); -} - -/** - * gtk_target_entry_copy: - * @data: a pointer to a #GtkTargetEntry - * - * Makes a copy of a #GtkTargetEntry and its data. - * - * Returns: a pointer to a copy of @data. - * Free with gtk_target_entry_free() - **/ -GtkTargetEntry * -gtk_target_entry_copy (GtkTargetEntry *data) -{ - GtkTargetEntry *new_data; - - g_return_val_if_fail (data != NULL, NULL); - - new_data = g_slice_new (GtkTargetEntry); - new_data->target = g_strdup (data->target); - new_data->flags = data->flags; - new_data->info = data->info; - - return new_data; -} - -/** - * gtk_target_entry_free: - * @data: a pointer to a #GtkTargetEntry. - * - * Frees a #GtkTargetEntry returned from - * gtk_target_entry_new() or gtk_target_entry_copy(). - **/ -void -gtk_target_entry_free (GtkTargetEntry *data) -{ - g_return_if_fail (data != NULL); - - g_free (data->target); - - g_slice_free (GtkTargetEntry, data); -} - - G_DEFINE_BOXED_TYPE (GtkSelectionData, gtk_selection_data, gtk_selection_data_copy, gtk_selection_data_free) @@ -3371,10 +3309,6 @@ G_DEFINE_BOXED_TYPE (GtkTargetList, gtk_target_list, gtk_target_list_ref, gtk_target_list_unref) -G_DEFINE_BOXED_TYPE (GtkTargetEntry, gtk_target_entry, - gtk_target_entry_copy, - gtk_target_entry_free) - static int gtk_selection_bytes_per_item (gint format) { diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h index 04f706764e..4d96d860d7 100644 --- a/gtk/gtkselection.h +++ b/gtk/gtkselection.h @@ -276,17 +276,6 @@ GtkSelectionData *gtk_selection_data_copy (const GtkSelectionData *data); GDK_AVAILABLE_IN_ALL void gtk_selection_data_free (GtkSelectionData *data); -GDK_AVAILABLE_IN_ALL -GType gtk_target_entry_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL -GtkTargetEntry *gtk_target_entry_new (const gchar *target, - guint flags, - guint info); -GDK_AVAILABLE_IN_ALL -GtkTargetEntry *gtk_target_entry_copy (GtkTargetEntry *data); -GDK_AVAILABLE_IN_ALL -void gtk_target_entry_free (GtkTargetEntry *data); - G_END_DECLS #endif /* __GTK_SELECTION_H__ */ -- 2.30.2